Merge branch 'master' into delsaplus

diff --cc reference/format0.txt
index a408b9026c826c70a4ee15ecebc2695942d2a90e,af9167e1ed785f54eb8abcc29a1527ddc0fcc01c..800a05598799d6751c599d09bd3f6bf222e39b1d
--- 1/reference/format0.txt
--- 2/reference/format0.txt
+++ b/reference/format0.txt
@@@ -4,7 -4,7 +4,6 @@@ v900             Columbus/Visiontac V900 files (.c
  csv           Comma separated values
  iblue747      csv     Data Logger iBlue747 csv
  iblue757      csv     Data Logger iBlue757 csv
- saroute       anr     DeLorme Street Atlas Route
 -saplus                DeLorme Street Atlas Plus
  exif  jpg     Embedded Exif-GPS data (.jpg)
  shape shp     ESRI shapefile
  igc           FAI/IGC Flight Recorder Data Format

diff --cc reference/format1.txt
index 69e89f18218eb8ec4cd0bcba0ff876e3bef29eaa,590d737f086b0fb1eea768f299a2c2f44b6b9a12..0d94e6df1c822e85fcee58e321fd78e8e1fdffb4
--- 1/reference/format1.txt
--- 2/reference/format1.txt
+++ b/reference/format1.txt
@@@ -7,7 -7,7 +7,6 @@@ file     csv             Comma separated value
  internal      custom          Custom "Everything" Style
  file  iblue747        csv     Data Logger iBlue747 csv
  file  iblue757        csv     Data Logger iBlue757 csv
- file  saroute anr     DeLorme Street Atlas Route
 -file  saplus          DeLorme Street Atlas Plus
  file  exif    jpg     Embedded Exif-GPS data (.jpg)
  file  shape   shp     ESRI shapefile
  file  igc             FAI/IGC Flight Recorder Data Format

diff --cc reference/format2.txt
index 2178646053e03abd4be207468641ec6092d1b369,9782f2bb8ac30feb9e431b09b99df1789112f674..a16404693c4dfaca3c0d84affa91e508064969b9
--- 1/reference/format2.txt
--- 2/reference/format2.txt
+++ b/reference/format2.txt
@@@ -7,7 -7,7 +7,6 @@@ file     rw----  csv             Comma separated value
  internal      rw----  custom          Custom "Everything" Style
  file  --rw--  iblue747        csv     Data Logger iBlue747 csv
  file  --rw--  iblue757        csv     Data Logger iBlue757 csv
- file  --r---  saroute anr     DeLorme Street Atlas Route
 -file  rw----  saplus          DeLorme Street Atlas Plus
  file  rw----  exif    jpg     Embedded Exif-GPS data (.jpg)
  file  rwrwrw  shape   shp     ESRI shapefile
  file  --rwrw  igc             FAI/IGC Flight Recorder Data Format

diff --cc reference/format3.txt
index 0d4fd1e4b20f84d1651cc6be3cd73276f44ed35a,7be292ff72f3d57954fa843848db8f7280ba1102..a0760c5ddccc67d26ec88c7caa9e2a48a90c3cc3
--- 1/reference/format3.txt
--- 2/reference/format3.txt
+++ b/reference/format3.txt
@@@ -116,18 -116,31 +116,6 @@@ option   iblue757        prefer_shortnames       Use s
  
  option        iblue757        datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html#fmt_iblue757_o_datum
  
- file  --r---  saroute anr     DeLorme Street Atlas Route      saroute
-       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html
- option        saroute turns_important Keep turns if simplify filter is used   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_turns_important
 -file  rw----  saplus          DeLorme Street Atlas Plus       xcsv
 -      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html
 -option        saplus  snlen   Max synthesized shortname length        integer         1               https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snlen
--
- option        saroute turns_only      Only read turns; skip all other points  boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_turns_only
 -option        saplus  snwhite Allow whitespace synth. shortnames      boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snwhite
--
- option        saroute split   Split into multiple routes at turns     boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_split
 -option        saplus  snupper UPPERCASE synth. shortnames     boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snupper
--
- option        saroute controls        Read control points as waypoint/route/none      string  none                    https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_controls
 -option        saplus  snunique        Make synth. shortnames unique   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snunique
--
- option        saroute times   Synthesize track times  boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_times
 -option        saplus  urlbase Basename prepended to URL on output     string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_urlbase
 -
 -option        saplus  prefer_shortnames       Use shortname instead of description    boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_prefer_shortnames
 -
 -option        saplus  datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_datum
 -
 -file  ----rw  destinator_itn  dat     Destinator Itineraries (.dat)   destinator_itn
 -      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_destinator_itn.html
 -file  rw----  destinator_poi  dat     Destinator Points of Interest (.dat)    destinator_poi
 -      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_destinator_poi.html
 -file  --rw--  destinator_trl  dat     Destinator TrackLogs (.dat)     destinator_trl
 -      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_destinator_trl.html
 -file  rw----  easygps loc     EasyGPS binary format   easygps
 -      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_easygps.html
--
  file  rw----  exif    jpg     Embedded Exif-GPS data (.jpg)   exif
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_exif.html
  option        exif    filename        Set waypoint name to source filename    boolean Y                       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_exif.html#fmt_exif_o_filename

diff --cc reference/help.txt
index eaad6737269ab06148f664afb50be8367179acf9,7cf8c1434ab4a64ecb93da543ff1ff017bc03562..f0ec61257a713faee3ef44fea46b9d6983b6050b
--- 1/reference/help.txt
--- 2/reference/help.txt
+++ b/reference/help.txt
@@@ -66,13 -66,18 +66,6 @@@ File Types (-i and -o options)
          urlbase               Basename prepended to URL on output 
          prefer_shortnames     (0/1) Use shortname instead of description 
          datum                 GPS datum (def. WGS 84) 
-   gpl                   DeLorme GPL
-       saroute               DeLorme Street Atlas Route
-         turns_important       (0/1) Keep turns if simplify filter is used 
-         turns_only            (0/1) Only read turns; skip all other points 
-         split                 (0/1) Split into multiple routes at turns 
-         controls              Read control points as waypoint/route/none 
-         times                 (0/1) Synthesize track times 
 -      saplus                DeLorme Street Atlas Plus
 -        snlen                 Max synthesized shortname length 
 -        snwhite               (0/1) Allow whitespace synth. shortnames 
 -        snupper               (0/1) UPPERCASE synth. shortnames 
 -        snunique              (0/1) Make synth. shortnames unique 
 -        urlbase               Basename prepended to URL on output 
 -        prefer_shortnames     (0/1) Use shortname instead of description 
 -        datum                 GPS datum (def. WGS 84) 
 -      destinator_itn        Destinator Itineraries (.dat)
 -      destinator_poi        Destinator Points of Interest (.dat)
 -      destinator_trl        Destinator TrackLogs (.dat)
 -      easygps               EasyGPS binary format
        exif                  Embedded Exif-GPS data (.jpg)
          filename              (0/1) Set waypoint name to source filename 
          frame                 Time-frame (in seconds)